194881 2019-02-20 16:12:22 -0800 [PSON] Make sure hung processes are not kept alive by suspended pages or process caching 2019-02-21 15:59:51 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue ggaren rniwa webkit-bug-importer oldest_to_newest 1508337 0 cdumez 2019-02-20 16:12:22 -0800 Make sure hung processes are not kept alive by suspended pages or process caching. 1508338 1 cdumez 2019-02-20 16:12:36 -0800 <rdar://problem/48249014> 1508345 2 362564 cdumez 2019-02-20 16:19:21 -0800 Created attachment 362564 Patch 1508348 3 362564 rniwa 2019-02-20 16:25:46 -0800 Comment on attachment 362564 Patch Is it possible for the process to start using a lot of CPU after it had entered the cache? Maybe we need to kill those processes retroactively as well? 1508349 4 362564 ggaren 2019-02-20 16:27:39 -0800 Comment on attachment 362564 Patch r=me 1508350 5 cdumez 2019-02-20 16:28:24 -0800 (In reply to Ryosuke Niwa from comment #3) > Comment on attachment 362564 [details] > Patch > > Is it possible for the process to start using a lot of CPU after it had > entered the cache? > Maybe we need to kill those processes retroactively as well? I do not think this is possible, such processes have no WebPages anymore. Running JS is normally the issue. 1508386 6 362564 commit-queue 2019-02-20 17:25:52 -0800 Comment on attachment 362564 Patch Clearing flags on attachment: 362564 Committed r241855: <https://trac.webkit.org/changeset/241855> 1508387 7 commit-queue 2019-02-20 17:25:54 -0800 All reviewed patches have been landed. Closing bug. 1508542 8 cdumez 2019-02-21 09:25:17 -0800 Follow-up fix for API tests in <https://trac.webkit.org/changeset/241868>. 1508719 9 cdumez 2019-02-21 15:59:51 -0800 Another follow-up fix: <https://trac.webkit.org/changeset/241919> 362564 2019-02-20 16:19:21 -0800 2019-02-20 17:25:52 -0800 Patch bug-194881-20190220161920.patch text/plain 12688 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkMTdkODJkNjVhYjBmODYx MTRmYzE3ZmI2ZTUxN2RiNWZiMjVlMDQuLjFkZWRjZjM3NWI5ODUzZDM1YTEwYWE2OTkwZjczOTRh NzkxMTQyNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTktMDItMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbUFNPTl0gTWFrZSBzdXJlIGh1bmcg cHJvY2Vzc2VzIGFyZSBub3Qga2VwdCBhbGl2ZSBieSBzdXNwZW5kZWQgcGFnZXMgb3IgcHJvY2Vz cyBjYWNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTQ4ODEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4MjQ5MDE0PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFmdGVyIHdlIGNvbnN0cnVjdCBh IFN1c3BlbmRlZFBhZ2VQcm94eSBhbmQgYmVmb3JlIHdlIHNlbmQgdGhlIElQQyB0byB0aGUgV2Vi UHJvY2VzcyB0bworICAgICAgICBhc2sgaXQgdG8gc3VzcGVuZCwgc3RhcnQgYSAxMCBzZWNvbmRz IHRpbWVyLiBJZiB0aGUgcHJvY2VzcyBkb2VzIG5vdCBhbnN3ZXIgdGhlIHJlcXVlc3QKKyAgICAg ICAgdG8gc3VzcGVuZCBiZWZvcmUgdGhlIHRpbWVyIGZpcmVzLCB3ZSBkZXN0cm95IHRoZSBTdXNw ZW5kZWRQYWdlUHJveHkgc28gdGhhdCB3ZSBkbyBub3QKKyAgICAgICAga2VlcCBhIGh1bmcgcHJv Y2VzcyBhcm91bmQuCisKKyAgICAgICAgRm9yIHRoZSBXZWJQcm9jZXNzQ2FjaGUsIHdlIG5vdyBj YWxsIFdlYlByb2Nlc3NQcm94eTo6aXNSZXNwb25zaXZlKCkgb24gdGhlIHByb2Nlc3MKKyAgICAg ICAgYmVmb3JlIGFkZGluZyBpdCB0byB0aGUgY2FjaGUuIEludGVybmFsbHksIHRoaXMgcmVsaWVz IG9uIGFuIElQQyBoYW5kc2hha2Ugd2l0aCB0aGUKKyAgICAgICAgV2ViUHJvY2Vzcy4gSWYgdGhl IHByb2Nlc3MgaXMgbm90IHJlc3BvbnNpdmUsIHdlIGRvIG5vdCBhZGQgaXQgdG8gdGhlIGNhY2hl IGFuZCB3ZQorICAgICAgICBzaHV0IGl0IGRvd24uIElmIGl0IGlzIHJlc3BvbnNpdmUgdGhlbiB3 ZSBwcm9jZWVkIG5vcm1hbGx5IHdpdGggYWRkaW5nIGl0IHRvIHRoZQorICAgICAgICBjYWNoZS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94eSk6CisgICAgICAg IChXZWJLaXQ6OlN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQp OgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OnN1c3BlbnNpb25UaW1lZE91 dCk6CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQcm9jZXNzQ2FjaGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzQ2FjaGU6OmFkZFByb2Nlc3NJZlBvc3NpYmxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc0NhY2hlOjphZGRQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc0Nh Y2hlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9M YXVuY2gpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Om1heWJlU2h1dERvd24p OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmlzUmVzcG9uc2l2ZSk6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorCiAyMDE5LTAyLTIwICBBbmR5IEVz dGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbWGNvZGVdIEFkZCBTREtWYXJpYW50 LnhjY29uZmlnIHRvIHZhcmlvdXMgWGNvZGUgcHJvamVjdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IDU5ZTBlMGIwMzI1ZTYxYWQ4MWQ4 NWQxZTEyNTc1NjJmY2M3NDlkNTAuLmYzNTQwNDAyYTAzMWRjOWM2ZjdmOTU1NzFlNTViNjg4Njhk YTc2YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5 LmNwcApAQCAtNDEsNiArNDEsOCBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIAorc3RhdGljIGNvbnN0IFNlY29uZHMgc3VzcGVuc2lvblRpbWVvdXQgeyAx MF9zIH07CisKICNpZiAhTE9HX0RJU0FCTEVECiBzdGF0aWMgY29uc3QgSGFzaFNldDxJUEM6OlN0 cmluZ1JlZmVyZW5jZT4mIG1lc3NhZ2VOYW1lc1RvSWdub3JlV2hpbGVTdXNwZW5kZWQoKQogewpA QCAtODEsNiArODMsNyBAQCBTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94eShX ZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JgogICAgICwgbV9wcm9jZXNz KFdURk1vdmUocHJvY2VzcykpCiAgICAgLCBtX21haW5GcmFtZUlEKG1haW5GcmFtZUlEKQogICAg ICwgbV9yZWdpc3RyYWJsZURvbWFpbih0b1JlZ2lzdHJhYmxlRG9tYWluKFVSTChVUkwoKSwgaXRl bS51cmwoKSkpKQorICAgICwgbV9zdXNwZW5zaW9uVGltZW91dFRpbWVyKFJ1bkxvb3A6Om1haW4o KSwgdGhpcywgJlN1c3BlbmRlZFBhZ2VQcm94eTo6c3VzcGVuc2lvblRpbWVkT3V0KQogI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpCiAgICAgLCBtX3N1c3BlbnNpb25Ub2tlbihtX3Byb2Nlc3MtPnRo cm90dGxlcigpLmJhY2tncm91bmRBY3Rpdml0eVRva2VuKCkpCiAjZW5kaWYKQEAgLTg4LDYgKzkx LDcgQEAgU3VzcGVuZGVkUGFnZVByb3h5OjpTdXNwZW5kZWRQYWdlUHJveHkoV2ViUGFnZVByb3h5 JiBwYWdlLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYKICAgICBpdGVtLnNldFN1c3BlbmRlZFBhZ2Uo dGhpcyk7CiAgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UucGFnZUlEKCksICp0aGlzKTsK IAorICAgIG1fc3VzcGVuc2lvblRpbWVvdXRUaW1lci5zdGFydE9uZVNob3Qoc3VzcGVuc2lvblRp bWVvdXQpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0SXNTdXNw ZW5kZWQodHJ1ZSksIG1fcGFnZS5wYWdlSUQoKSk7CiB9CiAKQEAgLTE2NCw2ICsxNjgsOCBAQCB2 b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVu c2lvblN0YXRlIG5ld1N1c3BlbnNpbwogCiAgICAgbV9zdXNwZW5zaW9uU3RhdGUgPSBuZXdTdXNw ZW5zaW9uU3RhdGU7CiAKKyAgICBtX3N1c3BlbnNpb25UaW1lb3V0VGltZXIuc3RvcCgpOworCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBtX3N1c3BlbnNpb25Ub2tlbiA9IG51bGxwdHI7 CiAjZW5kaWYKQEAgLTE4Myw2ICsxODksMTIgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRp ZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8KICAg ICAgICAgbV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcih0aGlzKTsKIH0KIAordm9pZCBTdXNwZW5k ZWRQYWdlUHJveHk6OnN1c3BlbnNpb25UaW1lZE91dCgpCit7CisgICAgUkVMRUFTRV9MT0dfRVJS T1IoUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBTdXNwZW5kZWRQYWdlUHJveHk6OnN1c3BlbnNpb25U aW1lZE91dCgpIGRlc3Ryb3lpbmcgdGhlIHN1c3BlbmRlZCBwYWdlIGJlY2F1c2UgaXQgZmFpbGVk IHRvIHN1c3BlbmQgaW4gdGltZSIsIHRoaXMpOworICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2wo KS5yZW1vdmVTdXNwZW5kZWRQYWdlKCp0aGlzKTsgLy8gV2lsbCBkZXN0cm95IHx0aGlzfC4KK30K Kwogdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVj dGlvbiYsIElQQzo6RGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBBU1NFUlQoZGVjb2Rlci5tZXNz YWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2Vp dmVyTmFtZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRl ZFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5 LmgKaW5kZXggODZhYzAyMDZiYTM4YmNhMTE4OGQzY2I0NjM1MjkxNWMxMmZiZTdiZC4uM2FkMTll YTZhZGU0ODRiOTZmNzY1NTJlZmQxODdhOTNiNjY2NTZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmgKQEAgLTYxLDYgKzYxLDcgQEAgcHVibGljOgog cHJpdmF0ZToKICAgICBlbnVtIGNsYXNzIFN1c3BlbnNpb25TdGF0ZSA6IHVpbnQ4X3QgeyBTdXNw ZW5kaW5nLCBGYWlsZWRUb1N1c3BlbmQsIFN1c3BlbmRlZCwgUmVzdW1lZCB9OwogICAgIHZvaWQg ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVuc2lvblN0YXRlKTsKKyAgICB2b2lkIHN1 c3BlbnNpb25UaW1lZE91dCgpOwogCiAgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKICAgICB2 b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpIGZp bmFsOwpAQCAtNzQsNiArNzUsNyBAQCBwcml2YXRlOgogCiAgICAgU3VzcGVuc2lvblN0YXRlIG1f c3VzcGVuc2lvblN0YXRlIHsgU3VzcGVuc2lvblN0YXRlOjpTdXNwZW5kaW5nIH07CiAgICAgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChTdXNwZW5kZWRQYWdlUHJveHkqKT4gbV9yZWFkeVRvVW5zdXNw ZW5kSGFuZGxlcjsKKyAgICBSdW5Mb29wOjpUaW1lcjxTdXNwZW5kZWRQYWdlUHJveHk+IG1fc3Vz cGVuc2lvblRpbWVvdXRUaW1lcjsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFByb2Nl c3NUaHJvdHRsZXI6OkJhY2tncm91bmRBY3Rpdml0eVRva2VuIG1fc3VzcGVuc2lvblRva2VuOwog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzQ2Fj aGUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmNwcAppbmRl eCBiMjBjMGUyMDFlODhiNzJjZmQ4MGUyMzEzMzYzYmM1Nzg0ODY3ZWNlLi4zZTllMTdlMGFkNmUw ZGUxOTE5NWM5YmU0M2QwMWVmMTMyYmYyYzY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NDYWNoZS5jcHAKQEAgLTQ0LDEzICs0NCw0NyBAQCBXZWJQcm9jZXNzQ2FjaGU6 OldlYlByb2Nlc3NDYWNoZShXZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wpCiAgICAgcGxhdGZv cm1Jbml0aWFsaXplKCk7CiB9CiAKLWJvb2wgV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNzKGNv bnN0IFN0cmluZyYgcmVnaXN0cmFibGVEb21haW4sIFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJv Y2VzcykKK2Jvb2wgV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNzSWZQb3NzaWJsZShjb25zdCBT dHJpbmcmIHJlZ2lzdHJhYmxlRG9tYWluLCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3Mp CiB7CiAgICAgQVNTRVJUKCFyZWdpc3RyYWJsZURvbWFpbi5pc0VtcHR5KCkpOwogICAgIEFTU0VS VCghcHJvY2Vzcy0+cGFnZUNvdW50KCkpOwogICAgIEFTU0VSVCghcHJvY2Vzcy0+cHJvdmlzaW9u YWxQYWdlQ291bnQoKSk7CiAgICAgQVNTRVJUKCFwcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmhhc1N1 c3BlbmRlZFBhZ2VGb3IocHJvY2VzcykpOwogCisgICAgaWYgKCFjYXBhY2l0eSgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzaW5nbGV0 b24oKS5pc1VuZGVyTWVtb3J5UHJlc3N1cmUoKSkgeworICAgICAgICBSRUxFQVNFX0xPRyhQcm9j ZXNzU3dhcHBpbmcsICIlcCAtIFdlYlByb2Nlc3NDYWNoZTo6YWRkUHJvY2Vzc0lmUG9zc2libGUo KTogTm90IGNhY2hpbmcgcHJvY2VzcyAlaSBiZWNhdXNlIHdlIGFyZSB1bmRlciBtZW1vcnkgcHJl c3N1cmUiLCB0aGlzLCBwcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIH0KKworICAgIGlmIChtX3Byb2Nlc3Nlc1BlclJlZ2lzdHJhYmxlRG9t YWluLmNvbnRhaW5zKHJlZ2lzdHJhYmxlRG9tYWluKSkgeworICAgICAgICBSRUxFQVNFX0xPRyhQ cm9jZXNzU3dhcHBpbmcsICIlcCAtIFdlYlByb2Nlc3NDYWNoZTo6YWRkUHJvY2Vzc0lmUG9zc2li bGUoKTogTm90IGNhY2hpbmcgcHJvY2VzcyAlaSBiZWNhdXNlIHdlIGFscmVhZHkgaGF2ZSBhIGNh Y2hlZCBwcm9jZXNzIGZvciB0aGlzIGRvbWFpbiIsIHRoaXMsIHByb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCkpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgUkVMRUFTRV9M T0coUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6OmFkZFByb2Nlc3NJZlBv c3NpYmxlKCk6IENoZWNraW5nIGlmIHByb2Nlc3MgJWkgaXMgcmVzcG9uc2l2ZSBiZWZvcmUgY2Fj aGluZyBpdC4uLiIsIHRoaXMsIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgIHBy b2Nlc3MtPnNldElzSW5Qcm9jZXNzQ2FjaGUodHJ1ZSk7CisgICAgcHJvY2Vzcy0+aXNSZXNwb25z aXZlKFtwcm9jZXNzID0gcHJvY2Vzcy5jb3B5UmVmKCksIHJlZ2lzdHJhYmxlRG9tYWluXShib29s IGlzUmVzcG9uc2l2ZSkgeworICAgICAgICBwcm9jZXNzLT5zZXRJc0luUHJvY2Vzc0NhY2hlKGZh bHNlKTsKKyAgICAgICAgaWYgKCFpc1Jlc3BvbnNpdmUpIHsKKyAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKFByb2Nlc3NTd2FwcGluZywgIiVwIC0gV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9j ZXNzSWZQb3NzaWJsZSgpOiBOb3QgY2FjaGluZyBwcm9jZXNzICVpIGJlY2F1c2UgaXQgaXMgbm90 IHJlc3BvbnNpdmUiLCAmcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzQ2FjaGUoKSwg cHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgICAgICAgICBwcm9jZXNzLT5zaHV0 RG93bigpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICghcHJv Y2Vzcy0+cHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzQ2FjaGUoKS5hZGRQcm9jZXNzKHJlZ2lzdHJh YmxlRG9tYWluLCBwcm9jZXNzLmNvcHlSZWYoKSkpCisgICAgICAgICAgICBwcm9jZXNzLT5zaHV0 RG93bigpOworICAgIH0pOworICAgIHJldHVybiB0cnVlOworfQorCitib29sIFdlYlByb2Nlc3ND YWNoZTo6YWRkUHJvY2Vzcyhjb25zdCBTdHJpbmcmIHJlZ2lzdHJhYmxlRG9tYWluLCBSZWY8V2Vi UHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MpCit7CisgICAgQVNTRVJUKCFwcm9jZXNzLT5wYWdlQ291 bnQoKSk7CisgICAgQVNTRVJUKCFwcm9jZXNzLT5wcm92aXNpb25hbFBhZ2VDb3VudCgpKTsKKyAg ICBBU1NFUlQoIXByb2Nlc3MtPnByb2Nlc3NQb29sKCkuaGFzU3VzcGVuZGVkUGFnZUZvcihwcm9j ZXNzKSk7CisKICAgICBpZiAoIWNhcGFjaXR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApA QCAtNjgsOCArMTAyLDEwIEBAIGJvb2wgV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNzKGNvbnN0 IFN0cmluZyYgcmVnaXN0cmFibGVEb21haW4sIFJlZjxXZWJQcm9jZXNzCiAgICAgYXV0byBhZGRS ZXN1bHQgPSBtX3Byb2Nlc3Nlc1BlclJlZ2lzdHJhYmxlRG9tYWluLmVuc3VyZShyZWdpc3RyYWJs ZURvbWFpbiwgW3Byb2Nlc3MgPSBwcm9jZXNzLmNvcHlSZWYoKV0oKSBtdXRhYmxlIHsKICAgICAg ICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8Q2FjaGVkUHJvY2Vzcz4oV1RGTW92ZShwcm9jZXNz KSk7CiAgICAgfSk7Ci0gICAgaWYgKCFhZGRSZXN1bHQuaXNOZXdFbnRyeSkKKyAgICBpZiAoIWFk ZFJlc3VsdC5pc05ld0VudHJ5KSB7CisgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTd2FwcGlu ZywgIiVwIC0gV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNzKCk6IE5vdCBjYWNoaW5nIHByb2Nl c3MgJWkgYmVjYXVzZSB3ZSBhbHJlYWR5IGhhdmUgYSBjYWNoZWQgcHJvY2VzcyBmb3IgdGhpcyBk b21haW4iLCB0aGlzLCBwcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsKICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIH0KIAogICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTd2FwcGluZywgIiVw IC0gV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNzOiBBZGRpbmcgcHJvY2VzcyAlaSB0byBXZWJQ cm9jZXNzIGNhY2hlLCBjYWNoZSBzaXplOiBbJXUgLyAldV0iLCB0aGlzLCBwcm9jZXNzLT5wcm9j ZXNzSWRlbnRpZmllcigpLCBzaXplKCksIGNhcGFjaXR5KCkpOwogICAgIHJldHVybiB0cnVlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzQ2FjaGUuaAppbmRleCAxOWFkZjYxN2E3 M2YzODU5NTBjZGNiYmZjNTUxOWQ1MDQ2ODVlNjAzLi5jNTIyMjVmMzdhOWJmYWM3NzBiYjlkZWUx YzUzMDJkODk2ZTc3OWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzQ2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzQ2Fj aGUuaApAQCAtNDEsNyArNDEsNyBAQCBjbGFzcyBXZWJQcm9jZXNzQ2FjaGUgewogcHVibGljOgog ICAgIGV4cGxpY2l0IFdlYlByb2Nlc3NDYWNoZShXZWJQcm9jZXNzUG9vbCYpOwogCi0gICAgYm9v bCBhZGRQcm9jZXNzKGNvbnN0IFN0cmluZyYgcmVnaXN0cmFibGVEb21haW4sIFJlZjxXZWJQcm9j ZXNzUHJveHk+JiYpOworICAgIGJvb2wgYWRkUHJvY2Vzc0lmUG9zc2libGUoY29uc3QgU3RyaW5n JiByZWdpc3RyYWJsZURvbWFpbiwgUmVmPFdlYlByb2Nlc3NQcm94eT4mJik7CiAgICAgUmVmUHRy PFdlYlByb2Nlc3NQcm94eT4gdGFrZVByb2Nlc3MoY29uc3QgU3RyaW5nJiByZWdpc3RyYWJsZURv bWFpbiwgV2Vic2l0ZURhdGFTdG9yZSYpOwogCiAgICAgdm9pZCB1cGRhdGVDYXBhY2l0eShXZWJQ cm9jZXNzUG9vbCYpOwpAQCAtNTgsNiArNTgsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBldmlj dFByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5Jik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUo KTsKKyAgICBib29sIGFkZFByb2Nlc3MoY29uc3QgU3RyaW5nJiByZWdpc3RyYWJsZURvbWFpbiwg UmVmPFdlYlByb2Nlc3NQcm94eT4mJik7CiAKICAgICB1bnNpZ25lZCBtX2NhcGFjaXR5IHsgMCB9 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBk MTQ0MWNiNGRhMWZmYTUwNzdjZDg5MjY4OTcxNzBjZWNmZGY1ZjMxLi45ZjA4ZDFjNDdjZTQzYjUw MTY1YzgxODM1Nzc3ZGRmM2ViODlmNzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5jcHAKQEAgLTYzNiw2ICs2MzYsMTAgQEAgdm9pZCBXZWJQcm9jZXNzUHJv eHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNoKCkKICAgICBhdXRvIHBhZ2Vz ID0gY29weVRvVmVjdG9yT2Y8UmVmUHRyPFdlYlBhZ2VQcm94eT4+KG1fcGFnZU1hcC52YWx1ZXMo KSk7CiAgICAgYXV0byBwcm92aXNpb25hbFBhZ2VzID0gV1RGOjptYXAobV9wcm92aXNpb25hbFBh Z2VzLCBbXShhdXRvKiBwcm92aXNpb25hbFBhZ2UpIHsgcmV0dXJuIG1ha2VXZWFrUHRyKHByb3Zp c2lvbmFsUGFnZSk7IH0pOwogCisgICAgYXV0byBpc1Jlc3BvbnNpdmVDYWxsYmFja3MgPSBXVEZN b3ZlKG1faXNSZXNwb25zaXZlQ2FsbGJhY2tzKTsKKyAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDog aXNSZXNwb25zaXZlQ2FsbGJhY2tzKQorICAgICAgICBjYWxsYmFjayhmYWxzZSk7CisKICAgICBp ZiAobV9pc0luUHJvY2Vzc0NhY2hlKSB7CiAgICAgICAgIGF1dG8gcmVtb3ZlZFByb2Nlc3MgPSBw cm9jZXNzUG9vbCgpLndlYlByb2Nlc3NDYWNoZSgpLnRha2VQcm9jZXNzKHJlZ2lzdHJhYmxlRG9t YWluKCksIHdlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQocmVtb3Zl ZFByb2Nlc3MsIHJlbW92ZWRQcm9jZXNzLmdldCgpID09IHRoaXMpOwpAQCAtODM5LDcgKzg0Myw3 IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjptYXliZVNodXREb3duKCkKICAgICBpZiAoc3RhdGUo KSA9PSBTdGF0ZTo6VGVybWluYXRlZCB8fCAhY2FuVGVybWluYXRlQXV4aWxpYXJ5UHJvY2Vzcygp KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoY2FuQmVBZGRlZFRvV2ViUHJvY2Vzc0NhY2hl KCkgJiYgcHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzQ2FjaGUoKS5hZGRQcm9jZXNzKHJlZ2lzdHJh YmxlRG9tYWluKCksICp0aGlzKSkKKyAgICBpZiAoY2FuQmVBZGRlZFRvV2ViUHJvY2Vzc0NhY2hl KCkgJiYgcHJvY2Vzc1Bvb2woKS53ZWJQcm9jZXNzQ2FjaGUoKS5hZGRQcm9jZXNzSWZQb3NzaWJs ZShyZWdpc3RyYWJsZURvbWFpbigpLCAqdGhpcykpCiAgICAgICAgIHJldHVybjsKIAogICAgIHNo dXREb3duKCk7CkBAIC0xMTgzLDExICsxMTg3LDExIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpz ZXRJc0hvbGRpbmdMb2NrZWRGaWxlcyhib29sIGlzSG9sZGluZ0xvY2tlZEZpbGVzKQogICAgIH0K IH0KIAotdm9pZCBXZWJQcm9jZXNzUHJveHk6OmlzUmVzcG9uc2l2ZShXVEY6OkZ1bmN0aW9uPHZv aWQoYm9vbCBpc1dlYlByb2Nlc3NSZXNwb25zaXZlKT4mJiBjYWxsYmFjaykKK3ZvaWQgV2ViUHJv Y2Vzc1Byb3h5Ojppc1Jlc3BvbnNpdmUoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sIGlzV2Vi UHJvY2Vzc1Jlc3BvbnNpdmUpPiYmIGNhbGxiYWNrKQogewogICAgIGlmIChtX2lzUmVzcG9uc2l2 ZSA9PSBOb09yTWF5YmU6Ok5vKSB7CiAgICAgICAgIGlmIChjYWxsYmFjaykgewotICAgICAgICAg ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2sp XSB7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2NhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgYm9vbCBpc1dlYlBy b2Nlc3NSZXNwb25zaXZlID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soaXNXZWJQ cm9jZXNzUmVzcG9uc2l2ZSk7CiAgICAgICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggODM3YmY4ZDViZDM3NDRhNzU1YTU5NmJhOTYwYjQz NWIwOWFiNjk1ZS4uOTRjOThkMjY5MjQ4M2JjYjBiODcxMThiMmI1ZTlhZDg2ZGNkZGU5YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTIwNiw3ICsyMDYs NyBAQCBwdWJsaWM6CiAKICAgICBQcm9jZXNzVGhyb3R0bGVyJiB0aHJvdHRsZXIoKSB7IHJldHVy biBtX3Rocm90dGxlcjsgfQogCi0gICAgdm9pZCBpc1Jlc3BvbnNpdmUoV1RGOjpGdW5jdGlvbjx2 b2lkKGJvb2wgaXNXZWJQcm9jZXNzUmVzcG9uc2l2ZSk+JiYpOworICAgIHZvaWQgaXNSZXNwb25z aXZlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCBpc1dlYlByb2Nlc3NSZXNwb25zaXZlKT4m Jik7CiAgICAgdm9pZCBpc1Jlc3BvbnNpdmVXaXRoTGF6eVN0b3AoKTsKICAgICB2b2lkIGRpZFJl Y2VpdmVNYWluVGhyZWFkUGluZygpOwogICAgIHZvaWQgZGlkUmVjZWl2ZUJhY2tncm91bmRSZXNw b25zaXZlbmVzc1BpbmcoKTsKQEAgLTQwOSw3ICs0MDksNyBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9pc0luUHJvY2Vzc0NhY2hlIHsgZmFsc2UgfTsKIAogICAgIGVudW0gY2xhc3MgTm9Pck1heWJl IHsgTm8sIE1heWJlIH0gbV9pc1Jlc3BvbnNpdmU7Ci0gICAgVmVjdG9yPFdURjo6RnVuY3Rpb248 dm9pZChib29sIHdlYlByb2Nlc3NJc1Jlc3BvbnNpdmUpPj4gbV9pc1Jlc3BvbnNpdmVDYWxsYmFj a3M7CisgICAgVmVjdG9yPENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCB3ZWJQcm9jZXNzSXNS ZXNwb25zaXZlKT4+IG1faXNSZXNwb25zaXZlQ2FsbGJhY2tzOwogCiAgICAgVmlzaWJsZVdlYlBh Z2VDb3VudGVyIG1fdmlzaWJsZVBhZ2VDb3VudGVyOwogCg==